t / t4135 / diff-with tab.diffon commit Merge branch 'en/merge-options-ff-and-friends' (9bc67b6)
   1--- post        image.txt.orig  2010-08-18 20:13:31.616002255 -0500
   2+++ post        image.txt       2010-08-18 20:13:31.616002255 -0500
   3@@ -1 +1 @@
   4-preimage
   5+postimage